This PR was automatically generated.
Merge changes from en.javascript.info at 273e47b

The following files have conflicts and may need new translations:

Please fix the conflicts by pushing new commits to this pull request, either by editing the files directly on GitHub or by checking out this branch.

We recommend to close this PR and merge conflicting changes manually.

The steps are:

1. Add remote upstream that links to the English version (only needs to be done once)
   • git add remote upstream https://github.com/javascript-tutorial/en.javascript.info
2. Commit all current work locally and git checkout master
3. Pull the recent changes from the English version:
   • git pull upstream master
4. Deal with the conflicts. If a conflict touches a few lines, then just fix them. Otherwise, following commands can help:
   • Checkout translated version of a file/folder at the given path:
     • git checkout --ours <path>
   • Checkout upstream version of a file/folder at the given path:
     • git checkout --theirs <path>
   • See what changed in the upstream file since branches diverged:
     • git diff --word-diff master...upstream/master <path> (please note: three dots in the command)
5. When conflicts resolved, commit them and git push origin master

Please ignore changes in Readme.md (git checkout --ours Readme.md && git commit -m ignore Readme.md).